From a3f56e39be1eabeea867f622e7c9b64f5d9fda01 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Sat, 29 Nov 2008 20:03:45 +0100 Subject: [PATCH] Fix call_ld_with_proper_flags.dpatch The script generating myocamlbuild_config.ml uses config/Makefile and doesn't handle the subst function of make. We work around this by doing the substitution inside the configure script. This also incidentally fixes FTBFS with dash (Closes: #506286). --- debian/patches/call_ld_with_proper_flags.dpatch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/patches/call_ld_with_proper_flags.dpatch b/debian/patches/call_ld_with_proper_flags.dpatch index 4151fe2e..5cb4a680 100755 --- a/debian/patches/call_ld_with_proper_flags.dpatch +++ b/debian/patches/call_ld_with_proper_flags.dpatch @@ -8,15 +8,14 @@ @DPATCH@ diff -urNad ocaml~/configure ocaml/configure ---- ocaml~/configure 2008-11-29 11:31:44.000000000 +0100 -+++ ocaml/configure 2008-11-29 11:31:48.000000000 +0100 -@@ -1548,7 +1548,8 @@ +--- ocaml~/configure 2008-12-02 01:24:33.000000000 +0100 ++++ ocaml/configure 2008-12-02 01:26:02.000000000 +0100 +@@ -1548,7 +1548,7 @@ echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile -echo "PACKLD=\$(PARTIALLD) \$(NATIVECCLINKOPTS) -o " >> Makefile -+echo "Wl = -Wl," >> Makefile -+echo "PACKLD=\$(PARTIALLD) $(subst \$(Wl),,\$(NATIVECCLINKOPTS)) -o " >> Makefile ++echo "PACKLD=\$(PARTIALLD) $(echo $nativecclinkopts|sed s/-Wl,//g) -o " >> Makefile echo "DLLCCCOMPOPTS=$dllccompopts" >> Makefile echo "IFLEXDIR=$iflexdir" >> Makefile echo "O=o" >> Makefile -- 2.30.2